bitkeeper revision 1.1243 (4225f63a_DvywTD0qmXez00zLLTU9Q)

manual merge

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc tools/libxc/xc.h
Simple merge

diff --cc xen/arch/x86/x86_32/asm-offsets.c
index a91692e3c607f22e732be1a9c480fd70cc84fe90,1733fb1240e05bff12599656d60233953f32a47a..e2f8f6cfb73a614662b074e1e130b5c1b26df900
--- 1/xen/arch/x86/x86_32/asm-offsets.c
--- 2/xen/arch/x86/x86_32/asm-offsets.c
+++ b/xen/arch/x86/x86_32/asm-offsets.c
@@@ -4,8 -4,8 +4,9 @@@
   * to extract and format the required data.
   */
  
+ #include <xen/config.h>
  #include <xen/sched.h>
 +#include <xen/config.h>
  
  #define DEFINE(_sym, _val) \
      __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) )